meson: Avoid using relative paths to po directory

Replace the relative path to the po directory with a toplevel definition
of po_dir and use that instead.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/507

diff --git a/data/meson.build b/data/meson.build
index 93a9391ea853239782479e24a90f95930bf03981..88a61765f50ccf0f3b75ba48b96151adbbbbcd36 100644 (file)
--- a/data/meson.build
+++ b/data/meson.build
@@ -24,7 +24,7 @@ foreach desktop_file : desktop_files
       configuration: desktopconf
     ),
     output: desktop_file,
-    po_dir: '../po',
+    po_dir: po_dir,
     install: true,
     install_dir: desktopdir,
     type: 'desktop'

diff --git a/meson.build b/meson.build
index 307cd6be6a0655f7477283e980b4ba6ae7280588..4dedaac3ced7da35c76aedc5fa44c3d128491e88 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -243,6 +243,8 @@ libgvc = subproject('gvc',
 )
 libgvc_gir = libgvc.get_variable('libgvc_gir')
 
+po_dir = join_paths(meson.current_source_dir(), 'po')
+
 subdir('js')
 subdir('src')
 subdir('po')

diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
index a7393fce5a2e09a408ba3db5b45700643069ded0..7363282a59bb602192fa4624c95d65baae7fc12b 100644 (file)
--- a/src/calendar-server/meson.build
+++ b/src/calendar-server/meson.build
@@ -30,7 +30,7 @@ configure_file(
 i18n.merge_file('evolution-calendar.desktop',
   input: 'evolution-calendar.desktop.in',
   output: 'evolution-calendar.desktop',
-  po_dir: '../../po',
+  po_dir: po_dir,
   install: true,
   install_dir: desktopdir,
   type: 'desktop'